Skip to content

[pull] master from mattermost:master - #898

Merged
pull[bot] merged 3 commits into
code:masterfrom
mattermost:master
Aug 10, 2026
Merged

[pull] master from mattermost:master#898
pull[bot] merged 3 commits into
code:masterfrom
mattermost:master

Conversation

@pull

@pull pull Bot commented Aug 10, 2026

Copy link
Copy Markdown

See Commits and Changes for more details.


Created by pull[bot] (v2.0.0-alpha.4)

Can you help keep this open source service alive? 💖 Please sponsor : )

cursor Bot and others added 3 commits August 10, 2026 12:00
…37857)

* [MM-70141] Remove dead SAML login button color settings

SamlSettings.LoginButtonColor / LoginButtonBorderColor / LoginButtonTextColor
were never consumed by any client (web or mobile) — the values reached the
client config but were never applied to the SAML login button, which renders
with fixed themed CSS. Remove the settings from the server model, client config
payload, Admin Console Experimental Features, webapp config types, config
fixtures, and documentation. The SAML login button label (LoginButtonText)
is retained.

Co-authored-by: mattermost-code <matty-code@mattermost.com>

* [MM-70141] Update admin console index test after SAML color removal

Searching for "saml" no longer matches Experimental Features once the
unused SAML login button color settings are removed from that section.

Co-authored-by: mattermost-code <matty-code@mattermost.com>

* Address PR feedback: remove unnecessary SAML color removal test case

Per reviewer feedback, drop the GenerateClientConfig test case that
asserted the removed SAML login button color props are absent. There is
no value in perpetually testing that a deleted feature stays deleted.

* chore: retrigger CI after transient Actions outage

Previous Server CI / API / Web App CI failures on 0f03c47 were GitHub
Actions infrastructure errors (Failed to resolve action download info /
Service Unavailable), not related to this PR's changes.

Co-authored-by: mattermost-code <matty-code@mattermost.com>

---------

Co-authored-by: Cursor Agent <cursoragent@cursor.com>
Co-authored-by: mattermost-code <matty-code@mattermost.com>
…37855)

* [MM-70140] Remove experimental AD/LDAP login button color settings

Remove the dead-code LdapSettings.LoginButtonColor / LoginButtonBorderColor /
LoginButtonTextColor experimental settings. These values were plumbed into the
client config but never consumed by the web or mobile clients, so no AD/LDAP
login button was ever rendered or colored.

Removes the fields from the server config struct and defaults, the client
config payload, the Admin Console Experimental Features section, the webapp
config type, related en.json strings, API definitions, docs, and test/default
config fixtures.

Co-authored-by: mattermost-code <matty-code@mattermost.com>

* [MM-70140] Add test guarding removal of LDAP login button color keys

Assert that GenerateLimitedClientConfig still emits LdapLoginFieldName under an
LDAP license but never emits the removed LdapLoginButtonColor/BorderColor/
TextColor keys, guarding against reintroduction of the dead settings.

Co-authored-by: mattermost-code <matty-code@mattermost.com>

* [MM-70140] Remove LDAP login button colors from webapp LdapSettings type

Keep AdminConfig LdapSettings in sync with the server model after the
experimental AD/LDAP login button color settings were removed.

Co-authored-by: mattermost-code <matty-code@mattermost.com>

* [MM-70140] Update admin console index test after LDAP color removal

Drop experimental/features from the ldap search expectation now that
the AD/LDAP login button color settings are no longer under Experimental.

Co-authored-by: mattermost-code <matty-code@mattermost.com>

* Address PR feedback: remove test for removed LDAP login button color settings

Per @lieut-data's review, drop TestGenerateLimitedClientConfigOmitsLdapLoginButtonColors;
there's no need to perpetually test that a removed feature stays removed.

* chore: retrigger CI after GitHub Actions service outage

Co-authored-by: mattermost-code <matty-code@mattermost.com>

* chore: retrigger CI after Actions service recovery

Co-authored-by: mattermost-code <matty-code@mattermost.com>

---------

Co-authored-by: Cursor Agent <cursoragent@cursor.com>
Co-authored-by: mattermost-code <matty-code@mattermost.com>
Co-authored-by: mattermost-build <mattermost-build@users.noreply.github.com>
@pull pull Bot locked and limited conversation to collaborators Aug 10, 2026
@pull pull Bot added the ⤵️ pull label Aug 10, 2026
@pull
pull Bot merged commit 6242bc3 into code:master Aug 10, 2026
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

0 participants